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

Fix deprecation warnings