Merge pull request #431 from chris5560/master