Session fix
Merge pull request #36 from Kristories/develop

Session fix