Ges 1396 my new feature

Can someone merge my changes?