manual merge. Resolves #5