dictionary deployment fix
Merge remote-tracking branch 'bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1
Merge pull request #12 from pjolszewski/RELEASE-2.1

starting exception repair