Resolves #54