Fix deprecation warnings for master
Merge pull request #20 from ss23/fix-master-deprecation

Fix deprecation warnings for master