Added tracker feature #118