Merge pull request #119 from ebfe/deprecated

Fix deprecation warnings
Fix deprecation warnings