Good suggestion, I will catch up all necessary changes and commit it later today in one go.
Thanks for your feedback.