Fix Crash
Merge pull request #1 from trees-software/master

Fix Crash