Berlin 2014: Improve program.
Merge remote-tracking branch 'jedi4ever/master'
Merge pull request #1266 from jbraeuer/master

Berlin 2014: Better program.