Merge pull request #409 from micmac1/fs-185