Merge pull request #1 from Midskiller/master

Setting up Workspace