Merge pull request #25 from Blopeur/master

Merging Heca Dev into Heca Master => release 0.1.1