Merge to master

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