Commit after halting work for Git issue #156
Merge branch 'master' of https://github.com/AutomationSolutionz/Framework_0.1