Update session support
Merge branch 'master' of https://github.com/cramblda/project