Latest changes not commited (9th of december 2014)