Add #26 enhancement