merge the build-0.4 into master
Merge remote-tracking branch 'origin/master' into build-0.4