closes #125
Merge branch 'master' into batch-ingest