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

Fix deprecation warnings