use origin/master instead of origin, fixes #16