Fix deprecations
Merge pull request #3 from stygstra/fix-deprecations

Fix deprecations