More NL updates
Merge pull request #559 from MPolleke/master

More NL updates