Merge pull request #20 from ExperienceOrb/master

Trying to fix david
Merge pull request #21 from ExperienceOrb/David's-Branch

Merge pull request #20 from ExperienceOrb/master