naming
Merge pull request #170 from leoliang/master

naming