Merge branch 'master' of https://github.com/unalignedcoder/CalibreImportShellExtension

Author: unalignedcoder