feature 2 - config chg 1
merged feature 2 into master