further improvements to C4
Merge pull request #2 from al-maisan/maintainer-auto-merge

*recommendation* against merging own patches