combined API
Merge pull request #2 from spinningplatesnyc/master

combined API