added support for new languages
fixed a bug