Merge pull request #1 from sumteh/develop

Develop
dev2 file edit
Merge pull request #6 from TemaYud/dev2

Dev2