Updates #10 with some additional doxygen mark-up