Merge pull request #6 from vexxhost/use-i18n

Use i18n marker for conf module