Simulation update
Merge branch 'develop'

Merging develop into master