Merge pull request #29 from JiaoXianjun/master