final commit from 05.01.2014