Changed to doxygen line comments, closes #41