Merging Martin's fork