Ignored some files
Merged to dev