* merging updates from SVN