Merge pull request #539 from pnewhook/master