Limited the amount of frames pre second (I think)
Merge remote-tracking branch 'origin/master'