Worked on windows support
Windows supprt and bugfix