Merge pull request #245 from svost/setofc4267