Merge pull request #395 from mibe/issue-395