Merge pull request #430 from rzurad/nsdocfix