Merge pull request #26 from wagnert/master

Refactoring for new session handling
Refactor session handling
Merge branch 'techdivision'