removed pop-up when closing
Merge branch 'rasmusPromise' into development