adding feature B
feature-b merged into master; resolves #2