Fabian 25 07 2014
Merge origin/master