Fixing deprecation warnings
Merge pull request #81 from darbyfrey/master

Fixing deprecation warnings