Merge pull request #50 from abubeck/indigo_dev

Updates for simulation on indigo