Done and pushed to master. Thank you, Manolis