Merge pull request #379 from 0xbsec/patch-1