add version 1.2
Merge pull request #18 from wangjeaf/master

Auto merge by kpm server