checking in
Merge pull request #1768 from magidraki/add-magidraki

Merging PR from @magidraki