commit 02.07.2014 rebased and error search