fix for win
Merge branch 'master' into wintest
fix for win
fix for win
fix for win
Merge pull request #424 from tetsurom/wintest

Some fix for windows