Added tracking to teaches (fix #30)