adding Feature D
feature-d merged into master; resolves #5