Address deprecations
Merge pull request #178 from loladiro/master

Fix some deprecation warnings