Added feature 3
Added fix for feature 3
Merge branch 'feature3' into develop (added feature 3 + fix)