Merge pull request #23 from Mov1s/development

Development
Fixed fore ma crash
Merge pull request #44 from sdmadsen/development

Development