Merge pull request #21 from xiaoyang-sde/master