Merge pull request #46 from gojp/fix-edict2-and-tests

Fix edict2 and tests
Fix bug in parser