Merge pull request #130 from jshackles/dev

Build 4.2
Merge pull request #138 from jshackles/dev

Build 4.3