[WIP] continue #52 and #93

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #52, #93
| License       | MIT
| Doc PR        | none

This PR is to continue #52 and #93.

As I don't see exactly what is missing please comment it and I will continue the job.