branch test
and simple
from master
conflict fixed
fix bug 101
merged bug fix 101