Fix Issue #17
Fixed inconsistencies
Merge branch 'issue_17_bis', fixing inconsistency with master and issue_17
Merge pull request #18 from AMIGA-IAA/master

Updating issue_17 with master