added changes from SVN