For https://webarchive.jira.com/browse/HER-2064
Merge pull request #40 from internetarchive/her-2064

For https://webarchive.jira.com/browse/HER-2064