Fixed deprecations
Merge pull request #1 from ffried/master

Fixed deprecations