Fixed bug with URIs
Updated version