Add feature required in  NERDZIlla issue #218