Merge pull request #1255 from jbraeuer/master

Berlin 2014: Better program.