Improve initialization of dictionaries
Merge pull request #117 from abelsiqueira/refactoring

Improve initialization of dictionaries