Gh394 git history

#394
//Done exept 3 and 5