Improved API
Merge branch 'master' of github.com:nathandinsmore/hoth