Merge pull request #8 from ExperienceOrb/master

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

Merge pull request #8 from ExperienceOrb/master