Merged
Merge pull request #3 from alicoding/l10ncmcavoy

Merged