addup_function completed
Merge branch 'master' into v2_addup_function
The master has been updated from 1.0 to 1.1 during
the 2.0 development phase.
final comments, completed
Merge branch 'v2_addup_function'
FInal merge, code complete