Bug fixes.
Merge branch 'develop' of github.com:pbattaglia/scenesim into develop