Merging in last few changes made to the version of the module on Drupal.org (fix for relative links issue by Lynna and some previous changes by Lola).