Changed the architecture to be more flexible.
Updated unnecessary lines in README.md
Merge pull request #8 from MarcCote/change_architecture

Changed the architecture to be more flexible.
Merge remote-tracking branch 'upstream/master'