Merge gregapompe

Merged and cleaned gregapompe's master. Tests in main module pass