Merge pull request #8 from sumteh/master

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

Merge pull request #8 from sumteh/master