Final commit 28.12.2014