master #15 - fix issue of URI space encoding