Fix #95 cleaner implementation of parse/redaction.
Merge pull request #105 from brettwooldridge/Bug#95

Fix #95 cleaner implementation of parse/redaction.