Merge pull request #274 from iainlane/master