Daily commit 17.05.2014