Resolves #28