Merge pull request #111 from MartyBurns/master

merged in Ron/Dons latest changes
Merge pull request #112 from MartyBurns/master

complete merge recovery with Rons last commit manually merged