Forward port changes from v1.0

[bettio]

No description provided.

[codecov]

Codecov Report

Merging #56 (ee3fed5) into master (b1b94ee) will not change coverage.
The diff coverage is n/a.

❗ Current head ee3fed5 differs from pull request most recent head b540f52. Consider uploading reports for the commit b540f52 to get more accurate results

@@           Coverage Diff           @@
##           master      #56   +/-   ##
=======================================
  Coverage   64.22%   64.22%           
=======================================
  Files           4        4           
  Lines         123      123           
=======================================
  Hits           79       79           
  Misses         44       44           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b1b94ee...b540f52. Read the comment docs.

[Annopaolo]

Superseded by #59.