Berlin 2013: Merge 2 proposals into 1.
Merge pull request #208 from jbraeuer/master

Berlin 2013: Merge 2 proposals into 1.