Update based on recommendation from Github