Fix some deprecation warnings
Merge pull request #36 from ljrmorgan/fix_deprecations

Fix some deprecation warnings