Merging changes from official SVN-Repository