Fix for #26 and Header Color issue
Implemented #24