Wrote more general Phevor.
Merge branch 'working'