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

Fix deprecation warnings