merged dev into elch, started working on support of multiple languages