rewrote to support multiple languages
Merge pull request #1 from ChrisMcKenzie/master

rewrote to support multiple languages