update fork to include latest bricky:master changes