Merge pull request #34 from qinshihu/dev