Fixed #51.
Resolved merge conflicts.
Merge branch 'develop' of https://github.com/dreid93/smmapp into develop