Berlin 2013: Matti Klasson's proposal.
Merge pull request #172 from jbraeuer/master

Berlin 2013: 1 more proposal.