Merge pull request #593 from tobiasd/20180425-lng