Merge remote-tracking branch 'upstream/master'
Tagging version 1.2.0
Merge pull request #29 from kflorence/master

Tagging version 1.2.0