Merge pull request #38 from FreeBirdLjj/issue#16