Merge pull request #27 from magkopian/dev

I fixed a couple of issues with the user management system
Updating README
Some code formatting, clean up, and commenting
Updating README