FASA 5.0 Fixes
Merge pull request #89 from Felger/master

FASA 5.0 Fixes