Merge pull request #578 from joshimhoff/master

Some New FSA Stuff