Merge pull request #209 from Kyoshiro-san/master
Fix deprecation notices, use internal variable typing