Merge pull request #183 from angathorion/session-handling
Session Handling

(main@64642a353f319a62a7f6bf65960d34023162e0f0)