Merge pull request #198 from jbraeuer/master

Berlin 2013: 1 more proposal.
Berlin 2013: Alex Schwatz's proposal.