fix 101
merge bug fix 101
add gitignore
merge master