final commit 16-07-2014