Updated API
Merge pull request #9 from captainbeverage/master

Updated API