Revert "Revert "Changes 17/10/2014""

This reverts commit a88e8ab92a97c9cb35d71ef45ac2ce3a2abe3830.