bug fix/ linux windows adaption