Issue #120 - Along with previous changeset implements better session handling