Revert "Revert "30-10-2014 - Peter Mademann""

This reverts commit d4b03f37632ce5595d2a2c40df0d49d82f5370cd.