Multiple fixes

- Broken requires
- Fixes failing tests
- Inconsistent indentation
Merge pull request #3 from felipecsl/master

Multiple fixes