Update to be fully compatible with modern API
Merge pull request #3 from quanah/master

Update to be fully compatible with modern API