Updated to latest version from SVN