Manual merge Branch edit - fixes #1

Manual merge Branch edit