Fix deprecation warnings
Merge pull request #2 from dieterdemeyer/master

Fix deprecation warnings