Merge to master
Merge to master
Fixed .gitignore