Initial commit
Fixing for windows compatibility