Fix typo and support other languages

Fix a typo and support other lanauges issue #40