Added FPS limit = 30
Merge remote-tracking branch 'upstream/master'