fix bug 101
merge bug fix101
add stash
add stash dev