Fix issue #10 + URI class speed improvements
2 files changed