fixed bug 002
changes when fix bug002
Merge branch 'fix-bug-002'