fix bug 10
merge bug fix 10
fix bug 101
merge bug fix 101