Merge pull request #1 from davestevens/develop

Daves mods.
New updates.