issue101 bug fixed
Merge branch 'issue_101'
feature3
f3 and bug 101