almost v.1.1.1
fixed merge conflicts