Berlin 2013: Updated Wes Mason's proposal.
Merge pull request #175 from jbraeuer/master

Berlin 2013: Updated proposal after speaker got feedback.