Merge pull request #582 from imphil/master