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

Develop