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

Revert "Revert "Revert "Refactor and new features"""