Modify config + path fixed
merge dev into master