Fixes #16

* All points of issue are covered
Merge pull request #17 from mmoreram/issue16-json-response-annotation

Fixes #16