Merge branch 'release/0.4.0' into develop
Improves intelligence of the tree.

- this may be costly, we'll see
Bumps version, updates changelog and build.
Merge branch 'release/0.4.1'