Merge pull request #199 from jbraeuer/master

Berlin 2013: +1 proposal.
Berlin 2013: Alexander Schwartz.