Integrated Rushana's pull request and removed DS_Store files.