min
updated docs
updated docs
reimplemented merge_dicts
min
min
refactored settings
min