Merge pull request #17 from ExperienceOrb/master

Merge master with David's Branch