Merge pull request #56 from yuxxxx/develop

Fix #54