Merge pull request #9 from marekjm/session-refactoring