Merge pull request #67 from yuntai/issue_56