Merge pull request #194 from jbraeuer/master

Berlin 2013: +/- 0
Berlin 2013: +1 proposal.