Evening commit from home 08.10.2014