Fixing br and tab so that echo -e isn't required.
Merge branch 'master' into develop