Merge pull request #531 from chris5560/master