manual merge. Resolves #3