Add feature-D And issues edit fix #2