Merge pull request #3 from zapiski/master

rebase
dela
Merge pull request #49 from dockiler/master

 login in session