Cleaned import from Google code repository