Merge pull request #13 from ExperienceOrb/master

Merge master with David's Branch
Merge pull request #14 from ExperienceOrb/David's-Branch

Merge pull request #13 from ExperienceOrb/master