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