Doc format tweak
Fix function unwrapping - harcoding bad! BAD!
Merge branch '1.6'