Merge pull request #574 from tobiasd/20180406-lng