Merge to master

Χάρης Παπαδόπουλος requested to merge harisrnd/e-epal:merge_to_master into master Jun 14, 2017