Version 0.4.0 - fresh approach
Merge branch 'release/0.4.0'