Issue209 pump records

Merge @Mathadon changes to the development branch.