Avoid max 20 users
Merge pull request #1 from swinkelhofer/master

Avoid max 20 users