Unb0rk Robot and simulator
Merge pull request #5 from pd0wm/simulator

Unb0rk Robot and simulator