Revert "Revert "07.10.2014 @ 12:49""

This reverts commit e9c18b810c76a3847abb74a21225190e37eadbe3.