I updated the pull request in that way. (Please try to compile it and report back :))