Merge pull request #398 from albialbi/patch-1