Ups class extend (and disabled by default). Closes #25