Implement os v1 and v2 replacements
Merge pull request #287 from tobie/elsigh

Implement os v1 and v2 replacements