Merge pull request #559 from micmac1/fs1104