Allow non master base branch

Replaces #44