merge with no-ff
fix bug 101
merged bug fixed 101