Merge branch 'develop'
Basic README update
Merge branch 'master' of github.com:jmcotelo/usg-engine into develop