Address #116

We'll also need the latest version of gpg-wrapper @0.0.36