Merge pull request #2 from alephtwo/master

User stuff
Merge pull request #5 from novoalg/master

Merge pull request #2 from alephtwo/master