Merge pull request #7 from sumteh/revert-6-dev2

Revert "Dev2"