Fix for #135
Merge pull request #1217 from imthinhvu/patch-6

Fix for #135