am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"

* commit 'b5f5dce4c722e797d9acbfaea24123dfbc58a82b':
  small changes to the code before the commit for supporting windows os