merging changes from SVN