Merge pull request #793 from eimlav/os-cleanup