Updates of FSA
Merge pull request #2 from ekfriis/master

Update FSA