Fix almost certain crash
Merge pull request #1 from 50DKP/development

Updating from master repo