Merge pull request #4 from Blopeur/master

Merge Heca dev branch into Heca Master