Merge pull request #1 from CStilidis/Chris

first merge
first commit
Merge pull request #2 from CStilidis/stilidis

second merge
first commit