Merge branch 'wait_for_brew' into working