handled case of records = 0
Merge branch 'dev'