Resolves #23