branch test
fix bug 101
merged bug 101