Merge pull request #53 from aiuto/from_piper

Mega merge of improvements from Google