branch readme
update feature readme
&simple
conflict fixed
fix bug 101
merged bug fix 101