Attempt at fix for #72
Merge pull request #1212 from imthinhvu/patch-4

Attempt at fix for #72