Found that the api was breaking with a few of the functions.

Commented out the functions that were breaking the api, now I'm trying to figure out why they break it...
Merge pull request #178 from Jedwondle/master

Found that the api was breaking with a few of the functions.