Merge pull request #530 from nla/nn-dsc-337

Nn dsc 337, merged.
Some minor fixes