upsert support and change file indentation
upsert support and tests; add check dependency (closes #22)