Windows fixes
Merge branch 'master' of github.com:kipr/libkovan
Merge branch 'master' of github.com:kipr/libkovan
Merge branch 'master' of github.com:kipr/libkovan
Merge branch 'master' of github.com:kipr/libkovan
Fixed windows build
Merged windows changes
Windows fixes