improve computation of E-cycles
Merge branch 'master' of github.com:hexhex/core
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into ps