Ignore DS files
Merge develop branch