Merge pull request #56 from bstell/master

Merge pull request #4 from googlei18n/master