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

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