old commit with minor changes
Merge branch 'master' of https://github.com/iakotopoulos/epark.git
Nicosia: refactor for resend task