Fixes to api
Merge branch 'master' of github.com:waseemAtRice/glass-present