Merge pull request #30 from Jonanin/master

Fixed build errors on Visual C++.