Merge tag '0.0.4' into develop

fix issues on build config file
Merge branch 'master' into develop
update version
Merge branch 'develop'