bugs with sessions - fixed
Merge branch 'sessions'