merge from master
add gitignore