Get rid of all deprecation warnings
Merge pull request #229 from joneslee85/patch1

Get rid of all deprecation warnings