Merge pull request #535 from micmac1/fs110319