Merge pull request #25 from wagnert/master

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