add config
Merging release into master.