merge fix
Merge pull request #23 from wh1pch81n/dh-20-2

cherry pick