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

Fix deprecation warnings