BREN-6 Fixes after QA
Merge pull request #2 from Edzelopez/master

BREN-6 Fixes after QA