Commit 17-12-2014