Merge pull request #394 from arfett/master