Merge pull request #2 from estliberitas/master

Windows support