Updated to latest simulator
Merge pull request #5 from Aalk4308/update-simulator-20141120

Updated to latest simulator