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

Fix deprecation warnings