Merge pull request #579 from tobiasd/20180410-lng