Thanks to jimbo1023 for the pull request. Due recent refactor jobs I had to rewrite these lines and did therefor not merge the pull.
