Bump version to 1.2 and Some modification