Better feature branch support

Alternate way to solve what #184 is solving