Merge setter

(plz do not accept this pull request)