Issue209 pump records

This pull request will move lots of changes from the `master` to the development branch.
Only minor changes where done to the `FlowMachine` package during my revisions over the past days (but some include fixes to malformed html).