Add forceEnclose option
Merge branch 'generator'