Merge pull request #529 from chris5560/master