added floor to framerate.
Merge branch 'dev'