Issue 3418 v2

Resolves issue: https://code.google.com/p/otwarchive/issues/detail?id=3418

Version .02 now includes tests!