For https://webarchive.jira.com/browse/ARI-3680
Merge pull request #21 from vonrosen/ari-3680

For https://webarchive.jira.com/browse/ARI-3680