Updated to v1.2

v1.2