merge bug fix
Merge branch 'dev'
add tmp/
remove tmp