Updated to latest simulator
Merge pull request #25 from Aalk4308/update-simulator-2014-12-02

Updated to latest simulator