Issue#210 nis

Fixes issue #210