commit 29_12_2014