KFSCNTRB-1020_CR Implemented requested changes from Foundation's
crucible review.
Merge pull request #25 from ua-eas/KFSCNTRB-1020_CR

KFSCNTRB-1020_CR Implemented requested changes from Foundation's