HomeHEPForge

Fixes merged from trunk