Modified gitignore
Final commit
Merge unsafe version