add to dev
fix bug 101
merged bug fix 101
xx3
merge dev