Merge pull request #1 from howepeng/1.0

20141109