Johns improvements
Merge pull request #7 from MartyBurns/master

Johns improvements