Merge pull request #7 from ExperienceOrb/master

Merge master with Kyle's Branch
Merge pull request #9 from ExperienceOrb/Kyle's-Branch

Merge pull request #7 from ExperienceOrb/master