Cherry-picked a commit that has been forgotten
Merge pull request #4 from vbmithr/master

Cherry picked a old important commit