Added change from learngit2