Merge pull request #1507 from kmilos/patch-1