Changes to code, not done.
Merge branch 'develop' of https://github.com/sindrma/workspaceOS into develop