Resolves #301