Merge pull request #315 from mwarning/nds2