Fix deprecations
Merge pull request #3 from Odyl/master

Fix deprecations