Refactored error handling
Refactor some more
Removed unused dependencies
Merge pull request #9 from jaunesarmiento/develop

Refactor