Changes based upon client feedback.
Merge pull request #49 from jordandukart/7.x

Changes based upon client feedback.