Merge pull request #167 from funnylookinhat/develop

Changes towards v1.2 milestone.