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

Fix deprecation warnings