Merge pull request #38 from almorelle/dev

Follow-up