Jacques Theron pull request

Hope this works?