added JSON parsing & error scenarios handling
Merge branch 'master' of https://github.com/AdrianAlan/on