Merge pull request #47 from JiaoXianjun/master