Fixes scrutinizer bugs.
Try to make scrutinizer happy (Take 2)
Try to make scrutinizer happy (Take 3)
Merge pull request #4 from mateu-aguilo-bosch/fix-scrutinizer

Fixes scrutinizer bugs.