fixed (maybe) session
Merge branch 'rasmusPromise' into development