First pass at #241
Merge pull request #1097 from imthinhvu/patch-1

First pass at #241