Merge pull request #7 from kelesidis/kiriakos

Kiriakos