Merge pull request #406 from micmac1/fs-184-186