Initial commit from Google code v1.1