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

Fix deprecation warnings