Berlin 2013: Wes Manson
Merge pull request #168 from jbraeuer/master

Berlin 2013: 1 more proposal.