Merge pull request #532 from chris5560/master