Merge pull request #23 from wagnert/master

Refactoring to make usage of multiple session handling
Merge pull request #24 from wagnert/master

Remove unnecessary space for PSR2 compatiblity
Refactoring for new session handling