Update from 09/06/14 including working with Doxygen