1.1
v1.2, bugs fixed