Redone repo
Merge pull request #31 from an-hmn/master

Redone repo