Merging Heca Dev into Heca Master => release 0.1.1