Merge pull request #433 from chris5560/master