Merge pull request #674 from rustyswayne/1.2.0

1.2.0 completed