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

Fix deprecation warnings