edits
Merge pull request #1 from 180vita/shippable_api

Merged shippable_api into master