Merge pull request #2 from VisionMise/master

Consolidated Branches