Branches/laurence hr

I fixed my old version... now working ;)