The changes in this class is the reason i made this a pull request