test branch
Fixed BPM calculation
Merge master thingy