minor update
checkout files from master
Checkout workspace-feature from master
Merge pull request #31 from qbuat/master-noel-revert

New PR of changes