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

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