Merge pull request #35 from JiaoXianjun/master