Resolve "intermediate release"

Closes #26 (closed).

Starting at #22, solve needed intermediate release merging !18 (closed), !19 (closed) and !20 (closed).