In loving memory of the author of the pull request #126
Merge pull request #198 from inverse-inc/feature/fix_remote

Rebase of the pull request #126