Resolves #76