Resync from google code
Merge pull request #1 from sguha00/sync

Resync from google code.