added feature 3 from feature 2
merged master into feature3