Updated 30/10/2014

Please merge the latest changes