Bug fix
Merge branch 'master' of github.com:ftlabs/newshack-api