adding feature a
feature-a merged into master; resolves #1