Merge pull request #79 from nlevitt/revisit-redux

Revisit redux
Fix for HER-2071
Merge pull request #8 from kris-sigur/HER-2071

Her 2071