1.2
Merge pull request #1 from tang2945/master

1.2