add 1.2
add 1.2
add 1.2
change docs
Merge pull request #34 from xudafeng/master

Auto merge by kpm server