merged changes from svn