updated to v1.2
merge conflict - we want 1.2