Merge branch 'release/1.0'
add gitignore