Changes again on client feedback.
Merge pull request #50 from jordandukart/7.x

Changes again on client feedback.