V1.2.1

Revise of 1.2