Merge branch 'release-1.0'
Passing parameters through config.h
Merge branch 'config_h' into develop