TonyAdo

@raine I will fix this as soon as I can . Besides if you have good idea about this, a PR is welcomed.

@erossignon really glad to see this, could you please open a PR?

@hanskhe sorry to reply you so late, I will look at this soon