Merge pull request #19 from ChrisBoesch/master

update
Merge pull request #246 from ruijunhuang2010/master

Merge pull request #19 from ChrisBoesch/master