Main: Fixing Branch handler
Merge pull request #132 from marcelometal/some_fixes

Main: Fixing Branch handler