Pull Request

I have updated my fork to 1.6 and now, here is my pull request. I hope i did everthing right..