Merge pull request #526 from chris5560/master