Fixed some warnings with MS compiler
Merge pull request #28 from jtilander/master

Fixed some warnings with MS compiler