edit dev1
Merge pull request #2 from sumteh/dev1

edit dev1