Merge pull request #40 from FreeBirdLjj/issue#16