Refactor session handling
Merge branch 'techdivision'
Merge pull request #24 from wagnert/master

Refactor session handling