add UsbDiagnostics code
merge master with new repo