Merge branch 'release/v0.4'
Merge branch 'release/0.4.1'
Improve the makefile
Bump version number
Merge branch 'hotfix/0.4.1.1' into develop