refactoring hash (-tables)  to maps to avoid confusion with hash functions
merge big refactoring of hash to map into master branch
merge branch 'map_refactoring'
finished refactoring from hash to map