Closed #294 - Session-ID structure + Closed #288 - Session-ID will be re...

...used