Merge pull request #605 from imphil/master