Merge pull request #7 from ExperienceOrb/master

Merge master with Kyle's Branch