Merge pull request #178 from burzum/develop

Develop
Fixing tests and working on the documentation
Merge branch 'develop' of github.com:burzum/users into develop