Commit from 11.01.2014