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

Fix deprecation warnings