Merge branch 'dev0.0.4' into dev