Merge pull request #1 from hsohn/henry

Henry
Merge remote-tracking branch 'origin/master'
yyz