more windows logict
Merge remote-tracking branch 'origin/master'
mac os normalization fixes