Add record_reader to setup
Merge branch 'development'