Push fixes
Merge branch 'master' of https://github.com/brosser/iDEA-Simulator