commit 18-12-2014