Berlin 2013: +1 proposal.
Merge pull request #196 from jbraeuer/master

Berlin 2013: +1 proposal