Close #118
Merge branch 'develop' of github.com:Symptogen/Symptogen into develop