Add -s option to do safe URLs
Merge re-hex branch with last-year branch