Added @wpreul code for better branch tracking
updated tests accordingly
updated reporter
Merge pull request #243 from alex-seville/branchTrackCleanup

Added @wpreul code for better branch tracking