Implement issues 10 and 57

François LAURENTrequested to merge
Makie-update into dev

See issues #10 (closed) and #57 (closed).

Merge request reports