canghai908 Merge pull request #57 from canghai908/dev