Changes here and there
Merge branch 'master' of https://github.com/akawer/MacVsWindows
Woot