danipoak Merge pull request #69 from eltociear/patch-1