Merge pull request #545 from chris5560/master