fixed greek letters
merged changes with origin