0.8.1 a rewrite version, now useable
merge 0.8.0