This resolves #23