Add peek-mode
Merge pull request #1015 from rmoritz/master

Add peek-mode