Add the ability to peek at messages

I messed up the PR #50 by moving the code to a new branch, this PR points as the correct branch. 

This PR should also fix #54.

Let me know if there are any issues with this.