added feature 3
Merge branch 'feature3' into develop