added new files and windows support