Allow user to switch session Fixes #82 and fixes #61