Merge pull request #578 from micmac1/osip512