first commit
Merge pull request #2 from CStilidis/stilidis

second merge