Fix deprecation warnings
Merge pull request #22 from infinityb/master

Fix deprecation warnings