Worked on code-documentation and some clean-up.
Authored by: davidfange 2015-05-20
Parent: [r720]
Child: [r722]