#132 remarge osek port

#132 remerge osek port. now windows and ubuntu are running togheter... :)