Additional specs added
Refactored controller a bit :)
Merge pull request #2 from Willianvdv/refactor

Refactored controller and added some extra tests