Update to sessions
Merge to master