Refactoring
Refactoring
Updated readme
Merge pull request #2 from emoacht/develop

Develop