Overlap flag for pyicoenrich
Solved conflict
Minor changes, more docs
Merging, fixing minor documentation details