Fixes ARGOeu/ARGO#54
Merge pull request #20 from andronat/fixes

Fixes ARGOeu/ARGO#54