Merge pull request #675 from rustyswayne/master

Merge 1.2.0 complete