add style
Merges from master
update gitignore