Berlin 2013: Raj Dudi's proposal.
Berlin2013: Leon's proposal.
Merge pull request #226 from jbraeuer/master

Berlin 2013: 1 more proposal.