portings from LHCb
Merge pull request #4 from fstagni/portings

portings from LHCb