Merge pull request #7 from atabar19/dev

modified source folder
Modified
modified