Implements #118