Ecephas fork

Merge my fork into master.