Fix issue with the returning of a non-JSON responses
Merge branch 'master' of github.com:savagematt/toshtogo