Merging huggle to Josve05a