Merge pull request #29 from linhaobuaa/master

some changes
little fix