Merge pull request #589 from tobiasd/20180420-lng