Fixing Windows compilation errors. There are still some warnings.
Merge pull request #3 from ruribe/master

Fixing some Windows problems (but still errors)