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

Fix deprecation warnings