malthe Merge pull request #380 from gforcada/patch-1