added feature A changes
Merge pull request #1 from amorris/featureA

added feature A changes