wch Merge pull request #185 from ColinFay/issue-82