Merge pull request #276 from bparker06/fps