Revert "Revert "16:39 22.12.2014""

This reverts commit 2bcd22ab0b52b3ebbc4c5fd31f7924a1583fffc8.

Revert "16:39 22.12.2014"

This reverts commit
8f8ececb917abe3496568cbbab369ad1d62c8950.