Merge pull request #428 from micmac1/fs-186