fixbug
merged bug fix 101
resolved
ok