Merge pull request #1373 from DimitriPapadopoulos/lgtm