Fixes
Merge pull request #46 from mateu-aguilo-bosch/Gizra-42

Fixes