Merge pull request #10 from MartyBurns/master

Update from Ron's files
Test merge with dons mods
Merge pull request #11 from RonPasquarelli/master

Test merge with dons mods