Revert "Refactor and new features"
Merge pull request #9 from danielfrg/revert-8-patch-1

Revert "Refactor and new features"