Autowrap feature (issue #43)