local collection support; manual merge closes PR #123