change dictionary to I18N-class

fixed issue #2
Merge remote-tracking branch 'origin/master'