Merge pull request #73 from paulocmguerreiro/master

Added control over userID definition to prevent an invalid userID:
userIds can contain "_" as well I believe

We can extend the allowed charecters to "." , "-"
Merge pull request #1 from OWASP/master

Update