@dapetcu21 's patch from issue #163
Merge pull request #164 from L8D/patch-1

@dapetcu21 's patch from issue #163