Fixed crash at start
Merge branch 'develop'