adding feature C
doing some more stuff for feature C
feature-c merged into master; resolves #3