copy 2.0.0 code from Google Code (SVN)