Better identify the startup frame

See #202
selected-frame is what we want
Merge remote-tracking branch 'origin/master'