Update with substitution group support
Update with substitution group support

dmj/jing-trang,hanshuebner/jing-trang,brand/jing-trang,dmj/jing-trang,hanshuebner/jing-trang,hanshuebner/jing-trang,brand/jing-trang,dmj/jing-trang,brand/jing-trang