Merge pull request #20 from ChrisBoesch/master

update
Merge pull request #249 from ruijunhuang2010/master

Merge pull request #20 from ChrisBoesch/master