First commit, copied from the private CCRi repo
Merge pull request #13 from OSERAF/f_from_ccri

First commit, copied from the private CCRi repo