Merge pull request #27 from kreczko/master

Fixing issue BristolTopGroup/NTupleProduction/#26
Fix for BristolTopGroup/AnalysisSoftware/#30 and BristolTopGroup/NTupleProduction/#25