Merge pull request #19 from 52North/develop

Develop
Merge branch 'master' of github.com:shane-axiom/SOS into fix-json-content-it