fix bug 101
merged bug fix 101
the stash file
merge dev file