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

Fix deprecation warnings