Fixes for language changes
Merge pull request #27 from mlubin/master

Fixes for dictionary changes