v1.5 beta

Numerous changes, see readme