Merge pull request #164 from funnylookinhat/develop

Code towards v1.2 Milestone