simulator updates
Merge pull request #27 from mikehoren/SIMULATOR

simulator updates