Merge pull request #17 from ExperienceOrb/master

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

Merge pull request #17 from ExperienceOrb/master