I like that idea, I'll update this PR little later today.