Changes for multi- OS implemented

Prepares the open Beta 0.6