Close #178, #179 & #180
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop