Update from Master

Remove .DS_Store
Find files better