Merge pull request #246 from svost/setofc4267