Berlin 2013: Alexander Schwartz.
Merge pull request #200 from jbraeuer/master

Berlin 2013: 1 more proposal.