Theodosiou commit
Add gtheodosiou's contribution
Merge branch 'gtheo-master'