Refine step 2

Σταύρος Παπαδάκης requested to merge spapad/e-epal:distr-review into develop Jun 23, 2017