Marcelgo feature/show current ws

I want to try to give you back changes for your pull request...don't know if that works, but I want to try it. Can you try and merge this into your own branch?