I have a pull request ready for this issue later today. I currently got some problems pushing to github through our corporate proxy ...