Use both amplitudes in case of double peak
Merge features of allpeaks
Merge branch 'develop' of https://github.com/Wickfish/DBSDetector into develop