Fix simulation reloading
Merge pull request #63 from mlolson/fix-bugs

Fix simulation reloading