Merge pull request #116 from MartyBurns/master

marked as 1.2 SNAPSHOT version