Trimming values
Merge https://github.com/edtubillara/Helenus