Berlin 2013: Peter Neumarks proposal.
Merge pull request #198 from jbraeuer/master

Berlin 2013: 1 more proposal.