Yeah, I think that's a good idea. I will work more on this later and send you another pull request. Thanks for the feedback.