Merge pull request #289 from micmac1/fs-updates