Final commit 17.09.2014