Squashed commit of the Masterproject 2014