Multiple users handling and cleaning up
Merge pull request #2 from achaussende/master

Merged. Thanks!