changes that Nighat/Hampton/Sami has made during the past year
Merge pull request #76 from NighatYasmin/nighat-files-fixes

changes that Nighat/Hampton/Sami has made during the past year