Custom user support

Fixes #8
Fixes #9