Get rid of opt --language
code refactoring
Add unit tests
Merge pull request #18 from bem/dev

Unit tests