Berlin 2013: Wes Manson - second proposal.
Merge pull request #183 from jbraeuer/master

Berlin 2013: Wes Manson, 2nd proposal.