Intermediate commit with code that builds.
Merge pull request #498 from Jedwondle/v1.2

Intermediate commit with code that builds.