fix bug 101
merged bug fix101
blah blah