Updated NMS support
Updated NMS support
Updated NMS support
Merge pull request #4 from DoctorDark/master

Forgot to update the NMS support for other classes too.