some modifications to integrate generator with wordpress
merged conflicts
encode uri in generator
add description