closes #479
Merge branch 'master' of https://github.com/Zeega/Japan-Digital-Archive into stable