Merge pull request #40 from kirca/mk_lang