complete merge recovery with Rons last commit manually merged
Merge pull request #112 from MartyBurns/master

complete merge recovery with Rons last commit manually merged