Closes #5 and small bugfixes

A small regression happened in the last commit due to which event
names weren't properly split.
Merge pull request #7 from gsi-upm/ws

Closes #5 and small bugfixes