szermatt Merge pull request #68 from xiaoyuechen/master