New windows workspace
Merge remote-tracking branch 'origin/master'
Merge pull request #175 from CarlosManias/master

New windows workspace