Merge pull request #8 from ExperienceOrb/master

Merge David's branch with master