Better language support
Merge pull request #25 from xbony2/master

Better language support