Merge pull request #670 from rustyswayne/1.2.0

Patch for broken build
Merge pull request #671 from rustyswayne/1.2.0

Patched broken test