Added NBNS support
Removed whitespace