Merge pull request #25 from nicolas-f/fix/workspace-list

Add name node under workspace node
clean code
Merge remote-tracking branch 'upstream/master' into fix/workspace-list