Resolves #27