Improve upstream remote

Fixes #107.