Merge pull request #556 from neheb/re