Updated for 1.1.0 and autodoxygen