merge gitcafe changes here