Merge pull request #665 from micmac1/sofi4