Merge pull request #358 from hatchan/patch-1