Fixed issues with windows
Merge branch 'master' of git://github.com/kipr/kiss