Last NL updates for now.
Merge pull request #605 from MPolleke/master

Last NL updates for now.