Berlin 2013: Alex Schwatz's proposal.
Merge pull request #199 from jbraeuer/master

Berlin 2013: +1 proposal.