Merge pull request #233 from ruijunhuang2010/master

Merge pull request #16 from ChrisBoesch/master