Fabian 26/08/2014
Merge origin/master