Version 0.04 with various fixes, details in Changes
Merge branch 'version-0.04'