Merge pull request from MStewGT/v1.2 v1.2 changes to update version and minor code fix