Merge pull request #402 from jow-/issue-382