Improved pitch detection and matching algorithm