Merge pull request #52 from glynos/master

Latest changes to the URI
Removed reset calls for optional values (deprecated in Boost.Optional).