Merge pull request #406 from tobiasd/20120228-lng