Styled it a bit :-)
Merge remote-tracking branch 'origin/Smaranda'