Merge pull request #33 from qinshihu/dev