Fresh add from google code repo (r191)