Merge pull request #32 from qinshihu/dev