changing session class around
Merge branch 'hotfix/0.0.1.5'