add brackethighlighter
merge with master