added sessions
Merge branch 'master' into password