Version fix

Master is still tagged with version `0.3.5`.
This branch merged the tip `0.4.0` with master to reflect the changes