Merge pull request #31 from FreeBirdLjj/issue#30