Now works with 1.0-svn