Thanks! And sorry. I`ll close this pull-request and make another one. To much commits for one pull-request.