Merge Heca dev branch into Heca Master 0.1.1