Fixes #139 (Shift-F5 bug) and #95 (Cmd-Alt-P feature)

It needs to be carefully reviewed of course.