merge

Merge pull request #8 from kongjian/master