Small changes
Merge branch 'master' of https://github.com/bobbarebygg/ETSN05
Workspace instance is now singleton