Merge pull request #2 from bpdavenport/master

Incorporate API changes