Add support for BRANDNAME. Closes #4
Remove unnecessary conditionals