Merge master with rebase
deleted branch rebase
redraw miss flag (black and more smal)