Fix push/pull

Fixes #18