black bar adding...
Merge branch 'master' into jeremysite