fix bug 101
merged bug fix 101
add DEV
fix dev confict