Minor refactoring for new session handling
Merge branch 'techdivision'
Minor refactoring
Make PSR2 compatible
Merge pull request #23 from wagnert/master

Minor refactoring for new session handling