up detection and nms issue
Merge branch 'feature/nms'