close #151
Close #158 and #102
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop