Emergency Crash Fix
Merge pull request #10 from aztectornado/master

Emergency Crash Fix