RobWHickman Merge pull request #44 from RobWHickman/dev