If you merge I can make another pull request to fix things, I found another little issue. Thx