Merge pull request #20 from devbug/master

for MinGW and Windows