merge dicts
improve space replacement
bump version