Bumped version to 1.2.0 and merged 1.1.1