Berlin 2013: Berkay's proposal.
Berlin 2013: Daniel's proposal.
Merge pull request #202 from jbraeuer/master

Berlin 2013: +2 proposals.