Merge branch 'release/0.2.0' into develop
Made extra dictionary more language independent.

Minor adjustments to the makefile.
Bumped version number.
Merge branch 'release/0.2.1'