TROIA-355
Merge pull request #77 from ipeirotis/TROIA-355

TROIA-355