fix bug 101
merge bug fix 101
fixed bug branch