New Simulator
Merge branch 'master' of https://github.com/vaibhavsuri/offset2014
Local merge