allow building single file
add event subtyping
fix variable interpolation with patch
Merge remote branch 'origin/master' into build
Merge remote branch 'origin/master' into build
updated