+ Add global -E option + Add %include -e option ~ Move -C option to %include and %resolve + Improve comments and messages