Berlin 2014: Program.
Berlin 2014: Minor fixed.
Berlin 2014: Improvements.
Merge pull request #1245 from jbraeuer/master

Berlin 2014: Program and improvements.