Refactoring session handling + minor bugfixes
Merge branch 'techdivision'
Merge pull request #27 from wagnert/master

Refactoring session handling + minor bugfixes