Emergency Patch pt.2
Merge pull request #57 from TechCavern/master

Emergency Patch pt.2