Fixed spawn opitons
Merged with previous changes
Merge branch 'develop' of https://github.com/stormstack/corenova-storm into develop