Code review dgunes

tmmdr mergeleyelim