20141031

v7 - minor changes from v6. Submitted version (eek).