version 1.2

some changes