Nearly complete Om os
Merge remote-tracking branch 'origin/Om-os'