Build convenience

Now master can be as convenient as the convenient branch.