To be done before release
- time tests and adjust number of iterations
- more testing
- documentation
