fix bug 101
merged bug fix 100
work finish
merged finish work