Merge pull request #8 from cuit-zhaxin/master

pull