Merge pull request #219 from ruijunhuang2010/master

Merge pull request #10 from ChrisBoesch/master