SESSION fixes/changes
Merge pull request #845 from TheUnknownOne/session

SESSION fixes/changes