Merge pull request #251 from tobiasd/20150403lng